update

Lius

2024-05-11 8464895b3474ed5dfc7d8ad9fa30a730bcb04000

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java

@@ -2,12 +2,15 @@

import lombok.Data;

import java.util.UUID;

/**
 * @author Lius
 * @date 2023/12/8 10:38
 */
@Data
public class MdcProcessCountDto {
    private String id = UUID.randomUUID().toString();
    private String equipmentId;
    private String equipmentName;
    private String driveType;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml

@@ -7,7 +7,7 @@
    </select>

    <select id="findRunningData" resultType="java.lang.String">
        SELECT ProductCount FROM [${tableName}] WHERE CollectTime BETWEEN #{ startTime } AND #{ endTime } GROUP BY ProductCount ORDER BY ProductCount
        SELECT ProductCount FROM [${tableName}] WHERE ProductCount &lt;&gt; '' AND CollectTime BETWEEN #{ startTime } AND #{ endTime } GROUP BY ProductCount ORDER BY ProductCount
    </select>

    <select id="getEquipProgramNum" resultType="org.jeecg.modules.mdc.dto.EquipmentMachingDto">

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java

@@ -105,6 +105,8 @@
            if (shiftSubIdList != null && !shiftSubIdList.isEmpty()) {
                String shift = String.join(",", shiftSubIdList);
                mdcOverallEquipmentEfficiency.setShift(shift);
            } else {
                mdcOverallEquipmentEfficiency.setShift("无");
            }

            if (StringUtils.isEmpty(mdcOverallEquipmentEfficiency.getShift())) {