故障报修验收

“linengliang”

2023-11-24 958bf805afffd10e2917166c5f0650fe7d4593fb

故障报修验收

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java

@@ -30,6 +30,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -240,4 +241,12 @@
        IPage<Map<String, Object>> equipmentReportRepairList = equipmentReportRepairService.getReportRepairList(pageNo, pageSize, params);
        return Result.ok(equipmentReportRepairList);
    }

    @PutMapping("/accept")
    public Result<?> accept(@RequestBody EquipmentReportRepair equipmentReportRepair ){
        equipmentReportRepair.setStatus("5");
        equipmentReportRepair.setAcceptTime(new Date());
        equipmentReportRepairService.updateById(equipmentReportRepair);
        return Result.OK("楠屾敹鎴愬姛");
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java

@@ -535,11 +535,12 @@
                             for(SysDictItem nodeOperationItem:nodeOperationItems){
                                 if(roleNodeItem.getItemValue().equals(nodeOperationItem.getItemValue())){
                                     if(ObjectUtils.isNotNull(operation)){
                                         List<String> buttonvalues = Arrays.asList(nodeOperationItem.getItemText().split(","));
                                         List<String> buttonValues = Arrays.asList(nodeOperationItem.getItemText().split(","));
                                        List<SysDictItem> operations = sysDictItemService.selectItemsByMainId(operation.getId());
                                        List<ButtonVo> buttons = new ArrayList<>();
                                        for(String value:buttonvalues){
                                        for(String value:buttonValues){
                                            for(SysDictItem name:operations){

                                                if(name.getItemValue().equals(value)){
                                                    ButtonVo button = new ButtonVo();
                                                    button.setName(name.getItemText());

 lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16(lnl)/2023_11_24.sql

对比新文件
@@ -0,0 +1,21 @@
ALTER TABLE [dbo].[mom_eam_equipment_report_repair] DROP CONSTRAINT [DF__mom_eam_e__err_u__00AD44A9]
    GO

ALTER TABLE [dbo].[mom_eam_equipment_report_repair] ALTER COLUMN [err_uda5] text NULL
    GO

    IF ((SELECT COUNT(*) FROM ::fn_listextendedproperty('MS_Description',
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_equipment_report_repair',
    'COLUMN', N'err_uda5')) > 0)
    EXEC sp_updateextendedproperty
    'MS_Description', N'楠屾敹鎰忚',
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_equipment_report_repair',
    'COLUMN', N'err_uda5'
    ELSE
    EXEC sp_addextendedproperty
    'MS_Description', N'楠屾敹鎰忚',
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_equipment_report_repair',
    'COLUMN', N'err_uda5'