Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

 north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java

@@ -5,10 +5,12 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.DeviceMaintenance;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.mapper.pp.DeviceMaintenanceMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.sql.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -62,9 +64,10 @@
        }
    }

    public Map<String, Object> selectMaintenanceSv() {
    public Map<String, Object> selectMaintenanceSv(Date selectTime1, Date selectTime2) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", deviceMaintenanceMapper.selectMaintenanceMp());
        map.put("data", deviceMaintenanceMapper.selectMaintenanceMp(selectTime1,selectTime2));
        map.put("process", deviceMaintenanceMapper.selectProcessMp());
        return map;
    }

@@ -77,4 +80,33 @@
            return false;
        }
    }

    public Map<String, Object> selectMachineSv() {
        Map<String, Object> map = new HashMap<>();
        map.put("data", deviceMaintenanceMapper.selectMachineMp());
        return map;
    }

    public Map<String, Object> openSelectIdSv(String id) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", deviceMaintenanceMapper.openSelectIdMp(id));
        return map;
    }

    public Boolean updateMaintenance(Map<String, Object> object) {
        JSONObject dataJson = new JSONObject(object);
        DeviceMaintenance deviceMaintenance = JSONObject.parseObject(JSONObject.toJSONString(dataJson.get("machine")), DeviceMaintenance.class);
        if (!dataJson.isEmpty()) {
                deviceMaintenanceMapper.updateMaintenanceMp(deviceMaintenance.getId(),deviceMaintenance.getDeviceName(),
                        deviceMaintenance.getType(),deviceMaintenance.getFaultTime(),deviceMaintenance.getFaultReason(),
                        deviceMaintenance.getMaintenanceTime(),deviceMaintenance.getMaintenanceIllustrate(),
                        deviceMaintenance.getStopTime(),deviceMaintenance.getStartTime(),deviceMaintenance.getProcess(),
                        deviceMaintenance.getPersonnel(),
                        deviceMaintenance.getCost()
                );
            return true;
        } else {
            return false;
        }
    }
}