Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs

野心家

2025-04-01 66942458f7753fe4ddee7c5ed3386d61cff28b24

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

@@ -5,9 +5,11 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.List;


@Service("wrkMastService")
public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
@@ -29,6 +31,11 @@

    @Override
    public int getOutToStn182(Integer devpNo) {
        return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).eq("wrk_sts",12));
        return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
    }

    @Override
    public int getStoreCount(Integer crnNo){
        return selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts",12,14,2));
    }
}